Revert "Revert "gtkwindow: Reset maximize / fullscreen_initially on state changes""

This reverts commit de2ea1ebaabd7550ca6f2a02bfbaa04ac92181fd.

No reason in the commit message was given for the revert, and we need
this for proper behavior on map.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a0b8f126f6590633717810287b5b36d1690f188c..00133126085f3f29a2d21ee442e9a92795be3e10 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7623,6 +7623,7 @@ gtk_window_state_event (GtkWidget           *widget,
     {
       priv->fullscreen =
         (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) ? 1 : 0;
+      priv->fullscreen_initially = priv->fullscreen;
     }
 
   if (event->changed_mask & GDK_WINDOW_STATE_TILED)
@@ -7635,6 +7636,7 @@ gtk_window_state_event (GtkWidget           *widget,
     {
       priv->maximized =
         (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) ? 1 : 0;
+      priv->maximize_initially = priv->maximized;
       g_object_notify (G_OBJECT (widget), "is-maximized");
     }